We currently have a mix of mocking methods. We should make this consistent
We currently have a mix of mocking methods. We should make this consistent