Added tests and concrete matrix types