Add Makefile and more tests