Changing from class overrides to method-mock to allow tests to pass (more localized behavior)