refactor test mocks to be more in line with swift ones