Restructure tests.
Add one more test.