Lots of util/matrix testing added