Fixes to the 'tests.