Fixed one unit test, a lot still need changing for readerwriter