Tidied up the directory structure of the repo and changed the names, cabal test now reports the result correctly