Now passes the new test cases.