we'll need to update the various unit tests that set a mock too!