Fixed for tests