Removed some cruft
Small fixes for CHeaderCollection + test coverage