Updates test harness and makefile