Modernise
Tweak mocking