clean up matrix tests