Improved test failure reporting.
Moved Haskell files into own subdir.