added tests & Makefile