Few test cases are working now