fixed failing test cases