Cleaned up makefile and test building a bit