Fixed the basic matrix tests