[FIX JENKINS-14494] Tests for Matrix Support.