Added expected calls to the methods in OptionModule