Minor fixes to tests.