Allow Test.hs to work with the current codebase.
Merge pull request #2 from sw17ch/master

Allow Test.hs to work with the current codebase.