Expand test matrix