Added matrix type + test file.