Some small fixes to reads classes and tests.