Add a couple new test cases.
Fix new tests.