@@ -10,5 +10,5 @@
 #endif
 
-PetscErrorCode testValidHeaders(PetscRandom r, PetscViewer v, PetscDraw d, PetscDrawAxis a)
+static PetscErrorCode testValidHeaders(PetscRandom r, PetscViewer v, PetscDraw d, PetscDrawAxis a)
 {
   /* incorrect */
@@ -13,5 +13,5 @@
 {
   /* incorrect */
-  PetscValidHeaderSpecificType(r, PETSC_VIEWER_CLASSID, 0, DMDA);
+  PetscValidHeaderSpecificType(r, PETSC_RANDOM_CLASSID, 1, DMDA);
   PetscValidHeaderSpecificType(v, PETSC_DRAW_CLASSID, 0, DMDA);
   PetscValidHeaderSpecificType(d, PETSC_DRAWAXIS_CLASSID, 0, DMDA);
@@ -14,5 +14,5 @@
   /* incorrect */
   PetscValidHeaderSpecificType(r, PETSC_VIEWER_CLASSID, 0, DMDA);
-  PetscValidHeaderSpecificType(v, PETSC_DRAW_CLASSID, 0, DMDA);
+  PetscValidHeaderSpecificType(v, PETSC_VIEWER_CLASSID, 2, DMDA);
   PetscValidHeaderSpecificType(d, PETSC_DRAWAXIS_CLASSID, 0, DMDA);
   PetscValidHeaderSpecificType(a, PETSC_RANDOM_CLASSID, 0, DMDA);
@@ -15,5 +15,5 @@
   PetscValidHeaderSpecificType(r, PETSC_VIEWER_CLASSID, 0, DMDA);
   PetscValidHeaderSpecificType(v, PETSC_DRAW_CLASSID, 0, DMDA);
-  PetscValidHeaderSpecificType(d, PETSC_DRAWAXIS_CLASSID, 0, DMDA);
+  PetscValidHeaderSpecificType(d, PETSC_DRAW_CLASSID, 3, DMDA);
   PetscValidHeaderSpecificType(a, PETSC_RANDOM_CLASSID, 0, DMDA);
 
@@ -16,5 +16,5 @@
   PetscValidHeaderSpecificType(v, PETSC_DRAW_CLASSID, 0, DMDA);
   PetscValidHeaderSpecificType(d, PETSC_DRAWAXIS_CLASSID, 0, DMDA);
-  PetscValidHeaderSpecificType(a, PETSC_RANDOM_CLASSID, 0, DMDA);
+  PetscValidHeaderSpecificType(a, PETSC_DRAWAXIS_CLASSID, 4, DMDA);
 
   /* correct */
@@ -25,5 +25,5 @@
 
   /* incorrect */
-  PetscValidHeaderSpecific(r, PETSC_DRAW_CLASSID, 0);
+  PetscValidHeaderSpecific(r, PETSC_RANDOM_CLASSID, 1);
   PetscValidHeaderSpecific(v, PETSC_DRAWAXIS_CLASSID, 0);
   PetscValidHeaderSpecific(d, PETSC_RANDOM_CLASSID, 0);
@@ -26,5 +26,5 @@
   /* incorrect */
   PetscValidHeaderSpecific(r, PETSC_DRAW_CLASSID, 0);
-  PetscValidHeaderSpecific(v, PETSC_DRAWAXIS_CLASSID, 0);
+  PetscValidHeaderSpecific(v, PETSC_VIEWER_CLASSID, 2);
   PetscValidHeaderSpecific(d, PETSC_RANDOM_CLASSID, 0);
   PetscValidHeaderSpecific(a, PETSC_VIEWER_CLASSID, 0);
@@ -27,5 +27,5 @@
   PetscValidHeaderSpecific(r, PETSC_DRAW_CLASSID, 0);
   PetscValidHeaderSpecific(v, PETSC_DRAWAXIS_CLASSID, 0);
-  PetscValidHeaderSpecific(d, PETSC_RANDOM_CLASSID, 0);
+  PetscValidHeaderSpecific(d, PETSC_DRAW_CLASSID, 3);
   PetscValidHeaderSpecific(a, PETSC_VIEWER_CLASSID, 0);
 
@@ -28,5 +28,5 @@
   PetscValidHeaderSpecific(v, PETSC_DRAWAXIS_CLASSID, 0);
   PetscValidHeaderSpecific(d, PETSC_RANDOM_CLASSID, 0);
-  PetscValidHeaderSpecific(a, PETSC_VIEWER_CLASSID, 0);
+  PetscValidHeaderSpecific(a, PETSC_DRAWAXIS_CLASSID, 4);
 
   /* correct */
@@ -37,5 +37,5 @@
 
   /* incorrect */
-  PetscValidHeader(r, 55);
+  PetscValidHeader(r, 1);
   PetscValidHeader(v, 56);
   PetscValidHeader(d, 57);
@@ -38,5 +38,5 @@
   /* incorrect */
   PetscValidHeader(r, 55);
-  PetscValidHeader(v, 56);
+  PetscValidHeader(v, 2);
   PetscValidHeader(d, 57);
   PetscValidHeader(a, 58);
@@ -39,5 +39,5 @@
   PetscValidHeader(r, 55);
   PetscValidHeader(v, 56);
-  PetscValidHeader(d, 57);
+  PetscValidHeader(d, 3);
   PetscValidHeader(a, 58);
 
@@ -40,5 +40,5 @@
   PetscValidHeader(v, 56);
   PetscValidHeader(d, 57);
-  PetscValidHeader(a, 58);
+  PetscValidHeader(a, 4);
 
   /* correct */