Minor fixes for tests