More tests, reader/writers modified