system-test: retain custom headers
check for duplicate header more thoroughly