remove hack from tests