concatenation and splitting of headers added. Test updated.