Small mess in tests