Included changes to 'outer loop' in test harness.