Better organization for reader related tests.

Just a little housekeeping.