some test cases added
Merge branch 'x-testing' of https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14 into x-testing