code cleanup
cleaned up tests based on suggestions
Merge branch 'master' of https://github.com/QFrameTK/TME