Tweak extent reading and tests