Properly fixed up tests.