Add some extra read tests, simplify some test setups