Changed how tests are performed