Some work on the tests

TestEmptyRead is now properly broken. I'm not sure what it's meant to do.