Issue #2358665 follow-up: fixing the tests
Issue #2350215: Removing more option set ID assumptions