Improved test matrix