diff --git a/index.js b/index.js
index c72b22d..983b053 100644
--- a/index.js
+++ b/index.js
@@ -19,7 +19,7 @@ module.exports.convert = convert;
 function convert(zdata, options, callback) {
     'use strict';
     options = options || {};
-    options.fontstack = options.fontstack || 'Open Sans';
+    options.fontstack = options.fontstack || 'Open Sans Regular';
 
     var tile;
 
diff --git a/src/tile.cpp b/src/tile.cpp
index 7fcb400..f2c0c70 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -459,9 +459,7 @@ void Tile::AsyncShape(uv_work_t* req) {
                         fontserver::glyph_info const& glyph = glyph_pos.second;
 
                         // DEBUG: This makes segfaults.
-                        font_engine_.mutex_.lock();
                         FT_Face font_face = glyph.face->get_face();
-                        font_engine_.mutex_.unlock();
 
                         // std::cout<<glyph->format<<'\n';
 
diff --git a/test/expected/shape.json b/test/expected/shape.json
index bffb8f0..c7300e3 100644
--- a/test/expected/shape.json
+++ b/test/expected/shape.json
@@ -50,17 +50,17 @@
         28544659
       ],
       "_features": [
-        567,
-        640,
-        936,
-        984,
-        1060,
-        1157,
-        1204,
-        1245,
-        1283,
-        1309,
-        1368
+        575,
+        648,
+        944,
+        992,
+        1068,
+        1165,
+        1212,
+        1253,
+        1291,
+        1317,
+        1376
       ]
     },
     "water": {
@@ -81,11 +81,11 @@
         0
       ],
       "_features": [
-        1577,
-        2048,
-        2129,
-        2175,
-        2223
+        1593,
+        2064,
+        2145,
+        2191,
+        2239
       ]
     },
     "road": {
@@ -150,43 +150,43 @@
         12177319
       ],
       "_features": [
-        2490,
-        2612,
-        2707,
-        2741,
-        2855,
-        2924,
-        2958,
-        2991,
-        3069,
-        3097,
-        3130,
-        3158,
-        3195,
-        3232,
-        3302,
-        3333,
-        3455,
-        3515,
-        3558,
-        3589,
-        3634,
-        3703,
-        3748,
-        3777,
-        3807,
-        3860,
-        3910,
-        3945,
-        3977,
-        4011,
-        4189,
-        4247,
-        4369,
-        4658,
-        4699,
-        5007,
-        5046
+        2554,
+        2676,
+        2771,
+        2805,
+        2919,
+        2988,
+        3022,
+        3055,
+        3133,
+        3161,
+        3194,
+        3222,
+        3259,
+        3296,
+        3366,
+        3397,
+        3519,
+        3579,
+        3622,
+        3653,
+        3698,
+        3767,
+        3812,
+        3841,
+        3871,
+        3924,
+        3974,
+        4009,
+        4041,
+        4075,
+        4253,
+        4311,
+        4433,
+        4722,
+        4763,
+        5071,
+        5110
       ]
     },
     "bridge": {
@@ -212,8 +212,8 @@
         "residential"
       ],
       "_features": [
-        5822,
-        5851
+        5894,
+        5923
       ]
     },
     "place_label": {
@@ -222,233 +222,209 @@
       "extent": 4096,
       "length": 3,
       "shaping": {
-        "Open Sans": {
+        "Open Sans Regular": {
           "Mill Valley": [
+            {
+              "face": 4293982555,
+              "glyph": 3,
+              "x": 45,
+              "y": 0
+            },
             {
               "face": 0,
               "glyph": 48,
-              "x": 0,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 76,
-              "x": 22,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 28,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 34,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 3,
-              "x": 40,
-              "y": 26
+              "x": 21,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 57,
-              "x": 46,
-              "y": 26
+              "x": 59,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 68,
-              "x": 60,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 73,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 79,
-              "y": 26
+              "x": 72,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 72,
-              "x": 85,
-              "y": 26
+              "x": 97,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 92,
-              "x": 98,
-              "y": 26
+              "glyph": 76,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 79,
+              "x": 33,
+              "y": 0
             }
           ],
           "Tamalpais Valley": [
-            {
-              "face": 0,
-              "glyph": 55,
-              "x": 0,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 68,
-              "x": 11,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 80,
-              "x": 24,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 68,
-              "x": 46,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 59,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 83,
-              "x": 65,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 68,
-              "x": 80,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 76,
-              "x": 93,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 86,
-              "x": 99,
-              "y": 26
-            },
             {
               "face": 0,
               "glyph": 3,
-              "x": 110,
-              "y": 26
+              "x": 45,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 48,
+              "x": 21,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 55,
+              "x": 13,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 57,
-              "x": 116,
-              "y": 26
+              "x": 59,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 68,
-              "x": 130,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 143,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 149,
-              "y": 26
+              "x": 72,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 72,
-              "x": 155,
-              "y": 26
+              "x": 97,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 92,
-              "x": 168,
-              "y": 26
+              "glyph": 76,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 79,
+              "x": 33,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 80,
+              "x": 48,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 83,
+              "x": 81,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 86,
+              "x": 111,
+              "y": 0
             }
           ],
           "Muir Beach": [
-            {
-              "face": 0,
-              "glyph": 48,
-              "x": 0,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 88,
-              "x": 22,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 76,
-              "x": 37,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 85,
-              "x": 43,
-              "y": 26
-            },
             {
               "face": 0,
               "glyph": 3,
-              "x": 53,
-              "y": 26
+              "x": 45,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 37,
-              "x": 59,
-              "y": 26
+              "x": 71,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 72,
-              "x": 75,
-              "y": 26
+              "glyph": 48,
+              "x": 21,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 55,
+              "x": 13,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 57,
+              "x": 59,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 68,
-              "x": 88,
-              "y": 26
+              "x": 72,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 70,
-              "x": 101,
-              "y": 26
+              "x": 108,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 75,
-              "x": 112,
-              "y": 26
+              "glyph": 72,
+              "x": 97,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 76,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 79,
+              "x": 33,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 80,
+              "x": 48,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 83,
+              "x": 81,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 85,
+              "x": 50,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 86,
+              "x": 111,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 88,
+              "x": 35,
+              "y": 0
             }
           ]
         }
@@ -480,9 +456,9 @@
         0
       ],
       "_features": [
-        6223,
-        6261,
-        6303
+        6343,
+        6381,
+        6423
       ]
     },
     "poi_label": {
@@ -491,175 +467,133 @@
       "extent": 4096,
       "length": 1,
       "shaping": {
-        "Open Sans": {
+        "Open Sans Regular": {
           "Muir Woods National Monument": [
+            {
+              "face": 4293981019,
+              "glyph": 3,
+              "x": 45,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 37,
+              "x": 71,
+              "y": 0
+            },
             {
               "face": 0,
               "glyph": 48,
-              "x": 0,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 88,
-              "x": 22,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 76,
-              "x": 37,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 85,
-              "x": 43,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 3,
-              "x": 53,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 58,
-              "x": 59,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 82,
-              "x": 81,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 82,
-              "x": 96,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 71,
-              "x": 111,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 86,
-              "x": 126,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 3,
-              "x": 137,
-              "y": 26
+              "x": 21,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 49,
-              "x": 143,
-              "y": 26
+              "x": 155,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 55,
+              "x": 13,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 57,
+              "x": 59,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 58,
+              "x": 78,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 68,
-              "x": 161,
-              "y": 26
+              "x": 72,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 87,
-              "x": 174,
-              "y": 26
+              "glyph": 70,
+              "x": 108,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 76,
-              "x": 182,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 82,
-              "x": 188,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 81,
-              "x": 203,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 68,
-              "x": 218,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 231,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 3,
-              "x": 237,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 48,
-              "x": 243,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 82,
-              "x": 265,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 81,
-              "x": 280,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 88,
-              "x": 295,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 80,
-              "x": 310,
-              "y": 26
+              "glyph": 71,
+              "x": 120,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 72,
-              "x": 332,
-              "y": 26
+              "x": 97,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 76,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 79,
+              "x": 33,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 80,
+              "x": 48,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 81,
-              "x": 345,
-              "y": 26
+              "x": 210,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 82,
+              "x": 92,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 83,
+              "x": 81,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 85,
+              "x": 50,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 86,
+              "x": 111,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 87,
-              "x": 360,
-              "y": 26
+              "x": 176,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 88,
+              "x": 35,
+              "y": 0
             }
           ]
         }
@@ -689,7 +623,7 @@
         "Park"
       ],
       "_features": [
-        6807
+        6926
       ]
     },
     "road_label": {
@@ -698,165 +632,309 @@
       "extent": 4096,
       "length": 7,
       "shaping": {
-        "Open Sans": {
+        "Open Sans Regular": {
           "Panoramic Hwy": [
+            {
+              "face": 4294174094,
+              "glyph": 3,
+              "x": 45,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 37,
+              "x": 71,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 43,
+              "x": 139,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 48,
+              "x": 21,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 49,
+              "x": 155,
+              "y": 0
+            },
             {
               "face": 0,
               "glyph": 51,
-              "x": 0,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 68,
               "x": 14,
-              "y": 26
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 81,
-              "x": 27,
-              "y": 26
+              "glyph": 55,
+              "x": 13,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 82,
-              "x": 42,
-              "y": 26
+              "glyph": 57,
+              "x": 59,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 85,
-              "x": 57,
-              "y": 26
+              "glyph": 58,
+              "x": 78,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 68,
-              "x": 67,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 80,
-              "x": 80,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 76,
-              "x": 102,
-              "y": 26
+              "x": 72,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 70,
               "x": 108,
-              "y": 26
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 3,
-              "x": 119,
-              "y": 26
+              "glyph": 71,
+              "x": 120,
+              "y": 0
             },
             {
               "face": 0,
-              "glyph": 43,
-              "x": 125,
-              "y": 26
+              "glyph": 72,
+              "x": 97,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 76,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 79,
+              "x": 33,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 80,
+              "x": 48,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 81,
+              "x": 210,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 82,
+              "x": 92,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 83,
+              "x": 81,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 85,
+              "x": 50,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 86,
+              "x": 111,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 87,
+              "x": 176,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 88,
+              "x": 35,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 90,
-              "x": 143,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 92,
-              "x": 162,
-              "y": 26
+              "x": 157,
+              "y": 0
             }
           ],
           "Shoreline Hwy": [
-            {
-              "face": 0,
-              "glyph": 54,
-              "x": 0,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 75,
-              "x": 13,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 82,
-              "x": 28,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 85,
-              "x": 43,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 72,
-              "x": 53,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 79,
-              "x": 66,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 76,
-              "x": 72,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 81,
-              "x": 78,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 72,
-              "x": 93,
-              "y": 26
-            },
             {
               "face": 0,
               "glyph": 3,
-              "x": 106,
-              "y": 26
+              "x": 45,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 37,
+              "x": 71,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 43,
-              "x": 112,
-              "y": 26
+              "x": 139,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 48,
+              "x": 21,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 49,
+              "x": 155,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 51,
+              "x": 14,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 54,
+              "x": 13,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 55,
+              "x": 13,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 57,
+              "x": 59,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 58,
+              "x": 78,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 68,
+              "x": 72,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 70,
+              "x": 108,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 71,
+              "x": 120,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 72,
+              "x": 97,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 75,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 76,
+              "x": 27,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 79,
+              "x": 33,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 80,
+              "x": 48,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 81,
+              "x": 210,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 82,
+              "x": 92,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 83,
+              "x": 81,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 85,
+              "x": 50,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 86,
+              "x": 111,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 87,
+              "x": 176,
+              "y": 0
+            },
+            {
+              "face": 0,
+              "glyph": 88,
+              "x": 35,
+              "y": 0
             },
             {
               "face": 0,
               "glyph": 90,
-              "x": 130,
-              "y": 26
-            },
-            {
-              "face": 0,
-              "glyph": 92,
-              "x": 149,
-              "y": 26
+              "x": 157,
+              "y": 0
             }
           ]
         }
@@ -900,66 +978,58 @@
         12188378
       ],
       "_features": [
-        7198,
-        7359,
-        7455,
-        7904,
-        8088,
-        8845,
-        9146
+        7285,
+        7446,
+        7542,
+        7991,
+        8175,
+        8932,
+        9233
       ]
     }
   },
   "faces": {
     "Open Sans Regular": {
       "glyphs": {
-        "3": {
-          "id": 3,
-          "width": 0,
-          "height": 0,
-          "left": 0,
-          "top": 0,
-          "advance": 6
-        },
         "37": {
           "id": 37,
-          "width": 13,
-          "height": 18,
-          "left": 2,
+          "width": 18,
+          "height": 19,
+          "left": 1,
           "top": 18,
-          "advance": 15
+          "advance": 19
         },
         "43": {
           "id": 43,
-          "width": 14,
-          "height": 18,
-          "left": 2,
-          "top": 18,
-          "advance": 17
+          "width": 12,
+          "height": 13,
+          "left": 1,
+          "top": 15,
+          "advance": 13
         },
         "48": {
           "id": 48,
-          "width": 18,
-          "height": 18,
-          "left": 2,
+          "width": 12,
+          "height": 19,
+          "left": 1,
           "top": 18,
-          "advance": 21
+          "advance": 13
         },
         "49": {
           "id": 49,
-          "width": 14,
+          "width": 7,
           "height": 18,
           "left": 2,
           "top": 18,
-          "advance": 18
+          "advance": 13
         },
         "51": {
           "id": 51,
           "width": 12,
-          "height": 18,
-          "left": 2,
+          "height": 19,
+          "left": 1,
           "top": 18,
-          "advance": 14
+          "advance": 13
         },
         "54": {
           "id": 54,
@@ -971,163 +1041,163 @@
         },
         "55": {
           "id": 55,
-          "width": 14,
+          "width": 12,
           "height": 18,
-          "left": 0,
+          "left": 1,
           "top": 18,
           "advance": 13
         },
         "57": {
           "id": 57,
+          "width": 12,
+          "height": 19,
+          "left": 1,
+          "top": 18,
+          "advance": 13
+        },
+        "58": {
+          "id": 58,
+          "width": 4,
+          "height": 15,
+          "left": 1,
+          "top": 14,
+          "advance": 6
+        },
+        "59": {
+          "id": 59,
+          "width": 5,
+          "height": 18,
+          "left": 0,
+          "top": 14,
+          "advance": 6
+        },
+        "68": {
+          "id": 68,
+          "width": 15,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 17
+        },
+        "70": {
+          "id": 70,
+          "width": 10,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 12
+        },
+        "71": {
+          "id": 71,
+          "width": 15,
+          "height": 19,
+          "left": 1,
+          "top": 18,
+          "advance": 17
+        },
+        "72": {
+          "id": 72,
+          "width": 14,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 17
+        },
+        "75": {
+          "id": 75,
+          "width": 13,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 14
+        },
+        "76": {
+          "id": 76,
+          "width": 10,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 12
+        },
+        "79": {
+          "id": 79,
+          "width": 17,
+          "height": 19,
+          "left": 1,
+          "top": 18,
+          "advance": 18
+        },
+        "80": {
+          "id": 80,
+          "width": 12,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 14
+        },
+        "81": {
+          "id": 81,
+          "width": 17,
+          "height": 23,
+          "left": 1,
+          "top": 18,
+          "advance": 18
+        },
+        "82": {
+          "id": 82,
+          "width": 13,
+          "height": 18,
+          "left": 2,
+          "top": 18,
+          "advance": 14
+        },
+        "83": {
+          "id": 83,
+          "width": 12,
+          "height": 19,
+          "left": 1,
+          "top": 18,
+          "advance": 13
+        },
+        "85": {
+          "id": 85,
+          "width": 14,
+          "height": 19,
+          "left": 2,
+          "top": 18,
+          "advance": 17
+        },
+        "86": {
+          "id": 86,
           "width": 15,
           "height": 18,
           "left": 0,
           "top": 18,
           "advance": 14
         },
-        "58": {
-          "id": 58,
+        "87": {
+          "id": 87,
           "width": 22,
           "height": 18,
           "left": 0,
           "top": 18,
           "advance": 22
         },
-        "68": {
-          "id": 68,
-          "width": 11,
-          "height": 15,
-          "left": 1,
-          "top": 14,
-          "advance": 13
-        },
-        "70": {
-          "id": 70,
-          "width": 10,
-          "height": 15,
-          "left": 1,
-          "top": 14,
-          "advance": 11
-        },
-        "71": {
-          "id": 71,
-          "width": 12,
-          "height": 20,
-          "left": 1,
-          "top": 19,
-          "advance": 14
-        },
-        "72": {
-          "id": 72,
-          "width": 12,
-          "height": 15,
-          "left": 1,
-          "top": 14,
-          "advance": 13
-        },
-        "75": {
-          "id": 75,
-          "width": 11,
-          "height": 19,
-          "left": 2,
-          "top": 19,
-          "advance": 14
-        },
-        "76": {
-          "id": 76,
-          "width": 4,
-          "height": 18,
-          "left": 1,
-          "top": 18,
-          "advance": 6
-        },
-        "79": {
-          "id": 79,
-          "width": 3,
-          "height": 19,
-          "left": 2,
-          "top": 19,
-          "advance": 6
-        },
-        "80": {
-          "id": 80,
-          "width": 19,
-          "height": 14,
-          "left": 2,
-          "top": 14,
-          "advance": 22
-        },
-        "81": {
-          "id": 81,
-          "width": 11,
-          "height": 14,
-          "left": 2,
-          "top": 14,
-          "advance": 14
-        },
-        "82": {
-          "id": 82,
-          "width": 13,
-          "height": 15,
-          "left": 1,
-          "top": 14,
-          "advance": 14
-        },
-        "83": {
-          "id": 83,
-          "width": 12,
-          "height": 20,
-          "left": 2,
-          "top": 14,
-          "advance": 14
-        },
-        "85": {
-          "id": 85,
-          "width": 8,
-          "height": 14,
-          "left": 2,
-          "top": 14,
-          "advance": 9
-        },
-        "86": {
-          "id": 86,
-          "width": 10,
-          "height": 15,
-          "left": 1,
-          "top": 14,
-          "advance": 11
-        },
-        "87": {
-          "id": 87,
-          "width": 8,
-          "height": 17,
-          "left": 0,
-          "top": 16,
-          "advance": 8
-        },
         "88": {
           "id": 88,
-          "width": 12,
-          "height": 14,
-          "left": 1,
-          "top": 13,
-          "advance": 14
+          "width": 14,
+          "height": 18,
+          "left": 0,
+          "top": 18,
+          "advance": 13
         },
         "90": {
           "id": 90,
-          "width": 19,
-          "height": 13,
-          "left": 0,
-          "top": 13,
-          "advance": 18
-        },
-        "92": {
-          "id": 92,
           "width": 13,
-          "height": 19,
+          "height": 18,
           "left": 0,
-          "top": 13,
-          "advance": 12
+          "top": 18,
+          "advance": 13
         }
       },
       "family": "Open Sans",
diff --git a/test/test.js b/test/test.js
index 7d4b776..44545ac 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,6 +5,7 @@ var fs = require('fs');
 var zdata = fs.readFileSync(__dirname + '/fixtures/mapbox-streets-v4.13.1306.3163.vector.pbf');
 var Protobuf = require('./format/protobuf');
 var VectorTile = require('./format/vectortile');
+var diff = require('deep-diff');
 
 function nobuffer(key, val) {
     return key !== '_buffer' && key !== 'bitmap' ? val : undefined;
@@ -12,7 +13,7 @@ function nobuffer(key, val) {
 
 function jsonEqual(key, json) {
     fs.writeFileSync(__dirname + '/expected/'+key+'.json', JSON.stringify(json, null, 2));
-    assert.deepEqual(json, require('./expected/'+key+'.json'));
+    assert.deepEqual(json, JSON.parse(fs.readFileSync(__dirname + '/expected/'+key+'.json')));
 }
 
 describe('convert', function() {
@@ -61,7 +62,7 @@ describe('convert', function() {
 
     it('shape', function(done) {
         var tile = new fontserver.Tile(data);
-        tile.shape('Open Sans', function(err) {
+        tile.shape('Open Sans Regular', function(err) {
             assert.ifError(err);
             var vt = new VectorTile(new Protobuf(new Uint8Array(tile.serialize())));
             var json = JSON.parse(JSON.stringify(vt, nobuffer));
@@ -75,7 +76,7 @@ describe('convert', function() {
         var remaining = 10;
         for (var i = 0; i < 10; i++) (function() {
             var tile = new fontserver.Tile(data);
-            tile.shape('Open Sans', function(err) {
+            tile.shape('Open Sans Regular', function(err) {
                 assert.ifError(err);
                 var vt = new VectorTile(new Protobuf(new Uint8Array(tile.serialize())));
                 var json = JSON.parse(JSON.stringify(vt, nobuffer));