removed src/Makefile and tweaked test/Makefile