Rename fixed Makefile-new-test to Makefile