refactor during code review
Merge branch 'master' of https://github.com/QFrameTK/TME
removed code duplication
code cleanup
named tests correctly