Fixed broken test test read stream and fixed logic of when to clean up Blocks