Organizes reader tests.

Fixes broken tests after recent refactors.
Restores previously removed method that was in fact still being called.