added test structure and coverage
removed htmlconv
Merge branch 'dev'