diff --git a/nc_test4/tst_files6.c b/nc_test4/tst_files6.c
index e5289cf4d..3b0555489 100644
--- a/nc_test4/tst_files6.c
+++ b/nc_test4/tst_files6.c
@@ -21,45 +21,45 @@ int
 main(int argc, char **argv)
 {
    printf("\n*** Testing netcdf file functions some more.\n");
-/*    printf("*** testing Jeff Whitaker's test..."); */
-/*    { */
-/* #define DIM_NAME "xc" */
-/* #define DIM_LEN 134 */
-/* #define VAR_NAME1 "var1" */
-/* #define VAR_NAME2 "var2" */
+   printf("*** testing Jeff Whitaker's test...");
+   {
+#define DIM_NAME "xc"
+#define DIM_LEN 134
+#define VAR_NAME1 "var1"
+#define VAR_NAME2 "var2"
 
-/*       int ncid, dimid, varid1, varid2, dimid_in; */
-/*       int ndims_in, natts_in; */
-/*       size_t len_in; */
-/*       char name_in[NC_MAX_NAME + 1]; */
-/*       nc_type xtype_in; */
+      int ncid, dimid, varid1, varid2, dimid_in;
+      int ndims_in, natts_in;
+      size_t len_in;
+      char name_in[NC_MAX_NAME + 1];
+      nc_type xtype_in;
 
-/*       if (nc_create(FILE_NAME, NC_CLOBBER|NC_NETCDF4, &ncid)) ERR; */
-/*       if (nc_def_dim(ncid, DIM_NAME, DIM_LEN, &dimid)) ERR; */
-/*       if (nc_def_var(ncid, VAR_NAME1, NC_FLOAT, 1, &dimid, &varid1)) ERR; */
-/*       if (nc_def_var(ncid, VAR_NAME2, NC_FLOAT, 1, &dimid, &varid2)) ERR; */
-/*       if (nc_def_var(ncid, DIM_NAME, NC_FLOAT, 1, &dimid, &varid2)) ERR; */
-/*       if (nc_close(ncid)) ERR; */
+      if (nc_create(FILE_NAME, NC_CLOBBER|NC_NETCDF4, &ncid)) ERR;
+      if (nc_def_dim(ncid, DIM_NAME, DIM_LEN, &dimid)) ERR;
+      if (nc_def_var(ncid, VAR_NAME1, NC_FLOAT, 1, &dimid, &varid1)) ERR;
+      if (nc_def_var(ncid, VAR_NAME2, NC_FLOAT, 1, &dimid, &varid2)) ERR;
+      if (nc_def_var(ncid, DIM_NAME, NC_FLOAT, 1, &dimid, &varid2)) ERR;
+      if (nc_close(ncid)) ERR;
 
-/*       /\* Open and check. *\/ */
-/*       if (nc_open(FILE_NAME, NC_CLOBBER|NC_NETCDF4, &ncid)) ERR; */
-/*       if (nc_inq_dim(ncid, 0, name_in, &len_in)) ERR; */
-/*       if (strcmp(name_in, DIM_NAME) || len_in != DIM_LEN) ERR; */
-/*       if (nc_inq_var(ncid, 0, name_in, &xtype_in, &ndims_in, */
-/* 		     &dimid_in, &natts_in)) ERR; */
-/*       if (strcmp(name_in, VAR_NAME1) || xtype_in != NC_FLOAT || */
-/* 	  ndims_in != 1 || dimid_in != 0 || natts_in != 0) ERR; */
-/*       if (nc_inq_var(ncid, 1, name_in, &xtype_in, &ndims_in, */
-/* 		     &dimid_in, &natts_in)) ERR; */
-/*       if (strcmp(name_in, VAR_NAME2) || xtype_in != NC_FLOAT || */
-/* 	  ndims_in != 1 || dimid_in != 0 || natts_in != 0) ERR; */
-/*       if (nc_inq_var(ncid, 2, name_in, &xtype_in, &ndims_in, */
-/* 		     &dimid_in, &natts_in)) ERR; */
-/*       if (strcmp(name_in, DIM_NAME) || xtype_in != NC_FLOAT || */
-/* 	  ndims_in != 1 || dimid_in != 0 || natts_in != 0) ERR; */
-/*       if (nc_close(ncid)) ERR; */
-/*    } */
-/*    SUMMARIZE_ERR; */
+      /* Open and check. */
+      if (nc_open(FILE_NAME, NC_CLOBBER|NC_NETCDF4, &ncid)) ERR;
+      if (nc_inq_dim(ncid, 0, name_in, &len_in)) ERR;
+      if (strcmp(name_in, DIM_NAME) || len_in != DIM_LEN) ERR;
+      if (nc_inq_var(ncid, 0, name_in, &xtype_in, &ndims_in,
+		     &dimid_in, &natts_in)) ERR;
+      if (strcmp(name_in, VAR_NAME1) || xtype_in != NC_FLOAT ||
+	  ndims_in != 1 || dimid_in != 0 || natts_in != 0) ERR;
+      if (nc_inq_var(ncid, 1, name_in, &xtype_in, &ndims_in,
+		     &dimid_in, &natts_in)) ERR;
+      if (strcmp(name_in, VAR_NAME2) || xtype_in != NC_FLOAT ||
+	  ndims_in != 1 || dimid_in != 0 || natts_in != 0) ERR;
+      if (nc_inq_var(ncid, 2, name_in, &xtype_in, &ndims_in,
+		     &dimid_in, &natts_in)) ERR;
+      if (strcmp(name_in, DIM_NAME) || xtype_in != NC_FLOAT ||
+	  ndims_in != 1 || dimid_in != 0 || natts_in != 0) ERR;
+      if (nc_close(ncid)) ERR;
+   }
+   SUMMARIZE_ERR;
    printf("*** testing HDF5 file with circular group structure...");
    {
       hid_t hdfid, grpid, grpid2, fapl_id;
@@ -77,15 +77,6 @@ main(int argc, char **argv)
                          H5P_DEFAULT) < 0) ERR;
       if (H5Fclose(hdfid) < 0) ERR;
 
-      /* /\* Reopen the file with HDF5. *\/ */
-      /* if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) ERR; */
-      /* if (H5Pset_fclose_degree(fapl_id, H5F_CLOSE_SEMI) < 0) ERR; */
-      /* if (H5Pset_cache(fapl_id, 0, CHUNK_CACHE_NELEMS, CHUNK_CACHE_SIZE, */
-      /*                  CHUNK_CACHE_PREEMPTION) < 0) ERR; */
-
-      /* if ((hdfid = H5Fopen(HDF5_FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) ERR; */
-      /* if (H5Pclose(fapl_id) < 0) ERR; */
-      /* if (H5Fclose(hdfid) < 0) ERR; */
       H5close(); /* Force HDF5 to forget about this file. */
 
       /* Now try and open it with netCDF. It will not work. */