Include test files + minor cabal fixes