Brought back my changes to the Makefile
Fixed the broken tests