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