fixing some test cases