Moved test harnesses around