Updated to test makefiles