Small tests refactor to remove un-needed mocks