Fixing up the mesh type and adding some test