Add missing test coverage.
Reorganize tests.