Re-sync these tests with orig after merge bugs.
1 file changed