Changes required to pass DatabaseReaderTest, DatabaseReaderTTest, CollectionReaderTTest, CollectionReaderTest