Updated Makefile to do testing and updated service demon script