Fix not correctly providing headers.
Add collections to the TestHelper.

Not tested yet.