Fixes to the tests.