Update test harness to use matching build system