Merge "Proposing a change to remove user validation tests"