Corrected current tests to match the new Reader structure