Update tool names and tests
Change test message in Makefile