diff --git a/.gitattributes b/.gitattributes
index 475cda4..3d2f636 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -453,10 +453,9 @@ test/H5Block/Makefile.am -text
 test/H5Fed/Makefile.am -text
 test/H5Fed/map_tet2globalid.c -text
 test/H5Fed/map_triangle2globalid.c -text
-test/H5Fed/read_tetmesh.c -text
-test/H5Fed/read_trianglemesh.c -text
 test/H5Fed/tetmesh_adjacencies.c -text
 test/H5Fed/tetmesh_read.c -text
+test/H5Fed/trimesh_read.c -text
 test/H5Fed/write_boundary.c -text
 test/H5Fed/write_tetmesh.c -text
 test/H5Fed/write_trianglemesh.c -text
diff --git a/test/H5Fed/read_tetmesh.c b/test/H5Fed/read_tetmesh.c
deleted file mode 100644
index 97c9f2a..0000000
--- a/test/H5Fed/read_tetmesh.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <hdf5.h>
-#include "H5Part.h"
-#include "H5Fed.h"
-
-#ifndef PARALLEL_IO
-#ifndef MPI_COMM_WORLD
-#define MPI_COMM_WORLD 0
-#endif
-#endif
-
-struct vertex {
-	h5_float64_t P[3];
-};
-
-typedef struct vertex vertex_t; 
-
-struct tet {
-	h5_id_t global_id;
-	h5_id_t parent_id;
-	h5_id_t vids[4];
-};
-typedef struct tet tet_t;
-
-h5_err_t
-read_vertices (
-	h5_file_t * f
-	) {
-	h5_id_t id, local_id;
-	h5_float64_t P[3];
-	h5_size_t real_num = 0;
-
-	h5_size_t num = H5FedGetNumVerticesTotal ( f );
-	printf ( "    Number of vertices on level: %lld\n", num );
-
-	h5_err_t h5err = H5FedBeginTraverseVertices ( f );
-	if ( h5err < 0 ) return h5err;
-	while ( (real_num < num) &&
-		((local_id = H5FedTraverseVertices ( f, &id, P )) >= 0) ) {
-		printf ( "    Vertex[%lld]: local id: %lld, coords: %f %f %f \n",
-			 id, local_id, P[0], P[1], P[2] );
-		real_num++;
-	}
-	H5FedEndTraverseVertices ( f );
-
-	if ( real_num != num ) {
-		fprintf ( stderr, "!!! Got %lld vertices, but expected %lld.\n",
-			  real_num, num );
-		return -1;
-	}
-	return H5_SUCCESS;
-}
-
-h5_err_t
-read_tets (
-	h5_file_t * f
-	) {
-	h5_id_t id, local_id, parent_id, vids[4];
-	h5_size_t real_num = 0;
-
-	h5_size_t num = H5FedGetNumElementsTotal ( f );
-	printf ( "    Number of tetrahedra on level: %lld\n", num );
-
-	h5_err_t h5err = H5FedBeginTraverseElements ( f );
-	if ( h5err < 0 ) return h5err;
-
-	while ( (real_num < num) &&
-		((local_id = H5FedTraverseElements (
-			  f, &id, &parent_id, vids )) >= 0) ) {
-		printf ( "    Tet[%lld]: local id: %lld, parent id: %lld,"
-			 " vids: %lld %lld %lld %lld\n",
-			 id, local_id, parent_id,
-			 vids[0], vids[1], vids[2], vids[3] );
-		real_num++;
-	}
-	H5FedEndTraverseElements ( f );
-	if ( real_num != num ) {
-		fprintf ( stderr, "!!! Got %lld tets, but expected %lld.\n",
-			  real_num, num );
-		return -1;
-	}
-
-	return H5_SUCCESS;
-}
-
-h5_err_t
-read_level (
-	h5_file_t * f
-	) {
-	h5_err_t h5err = read_vertices ( f );
-	if ( h5err < 0 ) {
-		fprintf ( stderr, "!!! Oops ...\n" );
-		return -1;
-	}
-	h5err = read_tets ( f );
-	if ( h5err < 0 ) {
-		fprintf ( stderr, "!!! Oops ...\n" );
-		return -1;
-	}
-	return H5_SUCCESS;
-}
-
-h5_err_t
-read_mesh (
-	h5_file_t * f
-	) {
-
-	h5_id_t level_id;
-	h5_size_t num_levels = H5FedGetNumLevels ( f );
-	printf ( "    Number of levels in mesh: %lld\n", num_levels );
-	for ( level_id = 0; level_id < num_levels; level_id++ ) {
-		h5_err_t h5err = H5FedSetLevel ( f, level_id );
-		if ( h5err < 0 ) {
-			fprintf ( stderr, "!!! Can't set level %lld.\n", level_id );
-			return -1;
-		}
-		h5err = read_level ( f );
-		if ( h5err < 0 ) {
-			fprintf ( stderr, "!!! Oops ...\n" );
-			return -1;
-		}
-	}
-
-	return H5_SUCCESS;
-}
-
-int
-main (
-	int argc,
-	char *argv[]
-	) {
-
-	H5SetVerbosityLevel ( 4 );
-
-	h5_file_t *f = H5OpenFile ( "simple_tet.h5", H5_O_RDONLY, 0 );
-	if ( f == NULL ) {
-		fprintf ( stderr, "!!! Can't open file.\n" );
-		return -1;
-	}
-
-	h5_size_t num_meshes = H5FedGetNumMeshes ( f, H5_TETRAHEDRAL_MESH );
-	printf ( "    Number of meshes: %lld\n", num_meshes );
-
-	h5_id_t mesh_id;
-	for ( mesh_id = 0; mesh_id < num_meshes; mesh_id++ ) {
-		h5_err_t h5err = H5FedOpenMesh ( f, mesh_id, H5_TETRAHEDRAL_MESH );
-		if ( h5err < 0 ) {
-			fprintf ( stderr, "!!! Can't open mesh %lld\n", mesh_id );
-			return -1;
-		}
-		h5err = read_mesh ( f );
-		if ( h5err < 0 ) {
-			fprintf ( stderr, "!!! Oops ...\n" );
-			return 1;
-		}
-	}
-
-	h5_err_t h5err = H5CloseFile ( f );
-	if ( h5err < 0 ) {
-		fprintf ( stderr, "!!! Can't close file.\n" );
-		return -1;
-	}
-	return 0;
-}
diff --git a/test/H5Fed/read_trianglemesh.c b/test/H5Fed/trimesh_read.c
similarity index 100%
rename from test/H5Fed/read_trianglemesh.c
rename to test/H5Fed/trimesh_read.c