nicer fix for tests