Apply new test matrix
Make the tests pass