Updates to gizmo test