fix: Custom reader should read till endblock

[svaningelgem]

Made it a recursive loop while sticking to the current code as close as possible. All tests pass without any change, and my new test works now too. (didn't work with the old code).

(afterwards I realized this is only an issue under v1, not v2. so I moved the test to v1)