restore tests involving square Z matrices