Fixing up Makefile and playing with tests