Updated matrix tests