Test harness update. All 16 scenarios passed.