Fixed commenting, added tests to cabal file.