Some testing related changes
Cabal file changes