Makefile tweaks.
Added tests to cabal.