Fix test cases 3,4 11 and 12