fixes for tests