Pull fixes to test directory

Added a make file and deleted an old test that doesn't build