Added some basic tests and updated Makefile