Expectation passing modified in StructureEx and extending classes to allow better flow control.