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

They are not actually expected to be preserved, although they might be.

Change-Id: I34e15f3d1e5b9b825e6fc14814c8e9a6ac151ce9
Merge "UserTest: Don't rely on the behavior of unknown user options"