Needed to fix across all branches... stupid of me really... less mocking in tests required.