Merge "UserTest: Don't rely on the behavior of unknown user options"