Added small changes to how tests are run