Fix for failing tests.