SCDM-4: Simplify option testing with value

Issue-Ref: 4