Minor fixes for tests.