Changed how tests are run