Added some tests
Merge branch 'master' of github.com:Spacejoker/hs-platform