Minor changes to the tests.