Edited MatrixTests suite