Fixes to tests.