More testing.
Make all tests pass.