minor refactorings
added code coverage support
wip