Cleanup the tests
Merge pull request #162 from tomaka/tests-rework

Cleanup the tests