Adding new Makefile that supports testing