#8 fix Makefile and tests