Clean up makefiles and test directory