More changes to do with how we're running the tests.