Adding Makefile and tests