Making tests runnable via cabal test.
Merge pull request #1 from WraithM/master

Making tests runnable via cabal test.