Some changes to get 'cabal test' working'