Added more matrixmaker tests