Refactor to always skip if mock isn't available