More work on the mocked tests. Iz Hard.