Add makefile for testing
Clean things up