in options and view statements. Also add a new set of tests to verify proper functioning. [RT #22418]