tweaked test matrix