Fix data structure issues for options-fixture stub