Use bl instead of concat-stream; stop depending on the finish event for that
Rework to use new content model
Get rid of load.noop test, since it's meaningless