original tests passing except read mocks, which need review