Apply new test matrix
fix the tests
local hack to allow overlaying multiple configs