Cleanup tests.
Add one more tests.