Added tests, fixed Makefile, fixed Makefile