I track opcounters - fix by explicitly setting @data_members
rearrange Given-When-Then and other rearrangement