Update VTK testing macro usage

Change-Id: I4c8b8e0d144f01816b8eb68436e6fd17dc64e71a
Merge topic 'vtk-test-macro-compat' into next

c068a1a1 Update VTK testing macro usage
Update VTK testing macro usage

Change-Id: I4c8b8e0d144f01816b8eb68436e6fd17dc64e71a
Merge topic 'vtk-test-macro-compat' into next

9b0810f3 Update VTK testing macro usage