Fix inconsistent tests.
Add 'noconcat' option to skip concatenation and

add all assets to the stream instead.