Fix test cases. Only two more to implement