Fix test typos - check all combinations

Change %headers to @headers to appropriately check all combinations
in each set of tests.
Merge pull request #1 from softmoth/test-dups

Fix test typos - check all combinations