Upgrade mocks to use v2 data