Further simplification of EasyTest
Merge pull request #83 from EaseTech/master

get latest from master