Merge "Test harness setting shouldn't prevent verification."