Fixing failing test cases.