Fix ReaderWriter + Add unit test