Generalize the FakeReader code.
Fix failing tests.