added more tests and updated the Makefile