Add matrix tests to test harness