Fix for tests