Fixed some test cases - RK