Refactor ReaderCensus; fix broken tests