Merge "Harmonizing test harness files" into devel/master