Improve consistency of unit test files
Improve coding style and grammar
Merge pull request #126 from steinwurf/test-cleanup

Test cleanup
merge