lay groundwork for v30 mocks