added more Makefile tests which is probably seriously unkosher, and changed code output to csv formatting