Add makefile and more tests