diff --git a/test/H5Fed/read_tetmesh.c b/test/H5Fed/read_tetmesh.c
index cd83113..69ebad6 100644
--- a/test/H5Fed/read_tetmesh.c
+++ b/test/H5Fed/read_tetmesh.c
@@ -134,7 +134,7 @@ main (
 
 	H5SetVerbosityLevel ( 4 );
 
-	h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_RDONLY );
+	h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_RDONLY, 0 );
 	if ( f == NULL ) {
 		fprintf ( stderr, "!!! Can't open file.\n" );
 		return -1;
diff --git a/test/H5Fed/read_trianglemesh.c b/test/H5Fed/read_trianglemesh.c
index 382c33a..1a2de8e 100644
--- a/test/H5Fed/read_trianglemesh.c
+++ b/test/H5Fed/read_trianglemesh.c
@@ -136,7 +136,7 @@ main (
 
 	H5SetVerbosityLevel ( 4 );
 
-	h5_file_t *f = H5OpenFile ( "simple_triangle.h5", H5_O_RDONLY );
+	h5_file_t *f = H5OpenFile ( "simple_triangle.h5", H5_O_RDONLY, 0 );
 	if ( f == NULL ) {
 		fprintf ( stderr, "!!! Can't open file.\n" );
 		return -1;
diff --git a/test/H5Fed/write_tetmesh.c b/test/H5Fed/write_tetmesh.c
index b7a5b58..e3c6bb5 100644
--- a/test/H5Fed/write_tetmesh.c
+++ b/test/H5Fed/write_tetmesh.c
@@ -50,7 +50,7 @@ main (
 	) {
 	H5SetVerbosityLevel ( 4 );
 
-	h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_WRONLY );
+	h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_WRONLY, 0 );
 	if ( f == NULL ) {
 		fprintf ( stderr, "!!! Can't open file.\n" );
 		return -1;
@@ -63,7 +63,7 @@ main (
 	}
 
 	int i;
-	H5FedAddNumVertices ( f, 5 );
+	H5FedBeginStoreVertices ( f, 5 );
 	for ( i = 0; i<5; i++ ) {
 		h5err = H5FedStoreVertex (
 			f,
@@ -74,7 +74,9 @@ main (
 			return -1;
 		}
 	}
-	H5FedAddNumElements ( f, 2 );
+	H5FedEndStoreVertices ( f );
+
+	H5FedBeginStoreElements ( f, 2 );
 	for ( i = 0; i<2; i++ ) {
 		h5err = H5FedStoreElement (
 			f,
@@ -85,13 +87,14 @@ main (
 			return -1;
 		}
 	}
+	H5FedEndStoreElements ( f );
 
 	h5_id_t level_id = H5FedAddLevel( f );
 	if ( level_id < 0 ) {
 		fprintf ( stderr, "!!! Can't add level.\n" );
 		return -1;
 	}
-	h5err = H5FedRefineNumElements ( f, 1 );
+	h5err = H5FedBeginRefineElements ( f, 1 );
 	if ( h5err < 0 ) {
 		fprintf ( stderr, "!!! Can't set number of elements torefine.\n" );
 		return -1;
@@ -102,6 +105,7 @@ main (
 		fprintf ( stderr, "!!! Can't refine tet.\n" );
 		return -1;
 	}
+	H5FedEndRefineElements ( f );
 
 	h5err = H5CloseFile ( f );
 	if ( h5err < 0 ) {
diff --git a/test/H5Fed/write_trianglemesh.c b/test/H5Fed/write_trianglemesh.c
index a6a2b37..d9c44eb 100644
--- a/test/H5Fed/write_trianglemesh.c
+++ b/test/H5Fed/write_trianglemesh.c
@@ -45,7 +45,7 @@ main (
 
 	H5SetVerbosityLevel ( 4 );
 
-	h5_file_t *f = H5OpenFile ( "simple_triangle.h5", H5_O_WRONLY );
+	h5_file_t *f = H5OpenFile ( "simple_triangle.h5", H5_O_WRONLY, 0 );
 	if ( f == NULL ) {
 		fprintf ( stderr, "!!! Can't open file.\n" );
 		return -1;
@@ -57,7 +57,7 @@ main (
 		return -1;
 	}
 
-	H5FedAddNumVertices ( f, 4 );
+	H5FedBeginStoreVertices ( f, 4 );
 	int i;
 	for ( i = 0; i < 4; i++ ) {
 		h5err = H5FedStoreVertex (
@@ -69,8 +69,9 @@ main (
 			return -1;
 		}
 	}
+	H5FedEndStoreVertices ( f );
 
-	H5FedAddNumElements ( f, 2 );
+	H5FedBeginStoreElements ( f, 2 );
 	for ( i = 0; i < 2; i++ ) {
 		h5err = H5FedStoreElement (
 			f,
@@ -81,6 +82,7 @@ main (
 			return -1;
 		}
 	}
+	H5FedEndStoreElements ( f );
 
 	h5_id_t level_id = H5FedAddLevel( f );
 	if ( level_id < 0 ) {
@@ -88,7 +90,7 @@ main (
 		return -1;
 	}
 
-	h5err = H5FedRefineNumElements ( f, 1 );
+	h5err = H5FedBeginRefineElements ( f, 1 );
 	if ( h5err < 0 ) {
 		fprintf ( stderr, "!!! Can't set number of elements torefine.\n" );
 		return -1;
@@ -99,6 +101,7 @@ main (
 		fprintf ( stderr, "!!! Can't refine tet.\n" );
 		return -1;
 	}
+	H5FedEndRefineElements ( f );
 
 	h5err = H5CloseFile ( f );
 	if ( h5err < 0 ) {