* increases unit test coverage * remove dead code * update documentation * light refactoring fix #670