Polish up the tests.