Updated tests and methods for required-option checking