fix of failing test cases