Fixing up some final tests.