Add skip

If we saved the context in the reader this could be simpler, but I'm not
sure we can do that.
At end test
Re-add pps check
Test file name logic