Adds tests
Merge branch 'feature/matrix' into feature/use-matrix