Hi, I just added the remaining tests from the Wisp reader testsuite to the patch, squashed and rebased it again. The updated patch is attached. As far as I know, all review comments are addressed and I hope this is ready to be merged. Test suite result: Totals for this test run: passes: 36 failures: 0 unexpected passes: 0 expected failures: 0 unresolved test cases: 0 untested test cases: 0 unsupported test cases: 0 errors: 0 The squashed patch: