Improve the tools in the Makefile for testing RED-I