JLF-18: Refactored the mocks to make them easier to maintain and extend