One more test. Fixing stuff found by the tests. Fixing tests. 4.9% coverage.