Some minor cleanup in the tests.