Tidy up doc blocks and use proper mocks.