Fixing up tests.