Minor changes to e2e mocks