Few more fixes to how tests are run