Small fixes for tests