Fix two more test cases and give up on the remaining two for now