Ported some more test cases.