Include forwarding test support in the new test harness