Fix for failing test cases.