Not really related to this PR but at some point we should probably consider having a common mocks module to include for tests so we don't duplicate these everywhere.