increase code coverage, wip

Still missing coverage on 4 lines, but it's closer.