More tests, reached 100% line and branch coverage for existing code.
Merging.