Update tests to reflect reader simplification