Also renamed tests
Fixes in new matrix and matrix handeling
Revert "Also renamed tests"

This reverts commit b767280483e5a3da365c0f581e382cc72d8dcf03.
Revert "Revert "Also renamed tests""

This reverts commit 1a937d576709e3e0af7aadee660d2df0a01f9720.