Better mocks and docs