Updated to latest test harness and makefile