Fixed another Future-race in tests