Updated to use test harness module