More tests and code coverage.