Makefile updates for command-line test util