Improved but incomplete test harness changes