Post-merge mock data fix

revert to state in #23