Added a better tester and some makefile stuff.