Latest fixes to the tests
Merge branch 'master' of me.github.com:esttorhe/ETFramework