Added tests

removed unused Makefile