Fix test.
Add more tests.