strip more headers from CLI tests