Adding test harness updates from 2.1