Added makefile and tests