Simplify tests infastructure
Merge pull request #1 from blackheaven/master

Simplify tests infastructure