[Bugfix] fix having a typename and method named M

call the matrix "Matrix" instead.
[bugfix][typo] remove semicolon at end of function signature
[TESTS] define a smoother in the tests to have them run properly