fixed matrix tests
merge matrix changes
Merge branch 'v2'