diff --git a/dev/fluids/Ammonia.json b/dev/fluids/Ammonia.json
index 76f28216..cf249c73 100644
--- a/dev/fluids/Ammonia.json
+++ b/dev/fluids/Ammonia.json
@@ -290,5 +290,141 @@
       "rhoVtriple_units": "mol/m^3"
     }
   ], 
-  "NAME": "Ammonia"
+  "NAME": "Ammonia", 
+  "TRANSPORT": {
+    "viscosity": {
+      "BibTeX": "Fenghour-JPCRD-1995", 
+      "_note": "There is a mysterious factor of 100 missing from the Fenghour equation for the dilute gas.  From REFPROP fluid file: !=0.021357*SQRT(MW)*(unknown factor of 100)  [Chapman-Enskog term]", 
+      "dilute": {
+        "C": 2.1357e-06, 
+        "a": [
+          4.9931822, 
+          -0.61122364, 
+          0.0, 
+          0.18535124, 
+          -0.11160946
+        ], 
+        "molar_mass": 0.01703026, 
+        "molar_mass_units": "kg/mol", 
+        "t": [
+          0, 
+          1, 
+          2, 
+          3, 
+          4
+        ], 
+        "type": "collision_integral"
+      }, 
+      "epsilon_over_k": 386, 
+      "epsilon_over_k_units": "K", 
+      "higher_order": {
+        "T_reduce": 405.4, 
+        "T_reduce_units": "K", 
+        "a": [
+          4.005040600989671e-06, 
+          -1.4107915123955129e-05, 
+          3.4760743039321816e-05, 
+          4.631310990138071e-06, 
+          -3.937374461785061e-06, 
+          -1.200075068367531e-05, 
+          1.9284977991745303e-06
+        ], 
+        "d1": [
+          3, 
+          3, 
+          2, 
+          4, 
+          4, 
+          2, 
+          4
+        ], 
+        "d2": [
+          1
+        ], 
+        "f": [
+          0.0
+        ], 
+        "g": [
+          1
+        ], 
+        "gamma": [
+          0, 
+          0, 
+          0, 
+          0, 
+          0, 
+          0, 
+          0
+        ], 
+        "h": [
+          0
+        ], 
+        "l": [
+          1, 
+          1, 
+          1, 
+          1, 
+          1, 
+          1, 
+          1
+        ], 
+        "p": [
+          1
+        ], 
+        "q": [
+          0
+        ], 
+        "rhomolar_reduce": 13211.8, 
+        "rhomolar_reduce_units": "mol/m^3", 
+        "t1": [
+          0, 
+          1, 
+          2, 
+          2, 
+          3, 
+          4, 
+          4
+        ], 
+        "t2": [
+          0
+        ], 
+        "type": "modified_Batschinski_Hildebrand"
+      }, 
+      "initial_density": {
+        "b": [
+          -1.7999496, 
+          46.692621, 
+          -534.60794, 
+          3360.4074, 
+          -13019.164, 
+          33414.23, 
+          -58711.743, 
+          71426.686, 
+          -59834.012, 
+          33652.741, 
+          -12027.35, 
+          2434.8205, 
+          -208.07957
+        ], 
+        "t": [
+          -0.0, 
+          -0.5, 
+          -1.0, 
+          -1.5, 
+          -2.0, 
+          -2.5, 
+          -3.0, 
+          -3.5, 
+          -4.0, 
+          -4.5, 
+          -5.0, 
+          -5.5, 
+          -6.0
+        ], 
+        "type": "Rainwater-Friend"
+      }, 
+      "sigma_eta": 2.957e-10, 
+      "sigma_eta_units": "m"
+    }
+  }
 }
\ No newline at end of file
diff --git a/doc/notebooks/transport_correlation_conversion.ipynb b/doc/notebooks/transport_correlation_conversion.ipynb
index 135e55c2..df7fd96d 100644
--- a/doc/notebooks/transport_correlation_conversion.ipynb
+++ b/doc/notebooks/transport_correlation_conversion.ipynb
@@ -190,6 +190,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
+      "# rho is units of mol/L, so convert the density to mol/L (poorly documented in paper)\n",
+      "\n",
       "D = [(3,0,0.17366936e-8),\n",
       " (3,1,-0.64250359e-8),\n",
       " (2,2,2.19664285e-7),\n",
@@ -198,8 +200,8 @@
       " (2,4,-0.83651107e-7),\n",
       " (4,4,0.77012274e-10)]\n",
       " \n",
-      "e_k = 386\n",
-      "rhoc = 225\n",
+      "e_k = 386.0\n",
+      "rhoc = 225.0/17.03026\n",
       "Tc = 405.4\n",
       "v = []\n",
       "for i,j,dij in D:\n",
@@ -213,11 +215,11 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "[0.0197820255375, -0.0696829732996963, 0.010081649810518732, 0.38957318686639053, -0.33120114806158074, -0.003480574788614132, 0.16221994918696753]\n"
+        "[4.005040600989671e-06, -1.4107915123955129e-05, 3.4760743039321816e-05, 4.631310990138071e-06, -3.937374461785061e-06, -1.200075068367531e-05, 1.9284977991745303e-06]\n"
        ]
       }
      ],
-     "prompt_number": 2
+     "prompt_number": 6
     },
     {
      "cell_type": "heading",
@@ -519,14 +521,6 @@
       }
      ],
      "prompt_number": 8
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
     }
    ],
    "metadata": {}
diff --git a/src/Tests/CoolProp-Tests.cpp b/src/Tests/CoolProp-Tests.cpp
index 793d116f..b1de59ee 100644
--- a/src/Tests/CoolProp-Tests.cpp
+++ b/src/Tests/CoolProp-Tests.cpp
@@ -66,13 +66,13 @@ vel("Hydrogen", "T", 35, "Dmass", 100, "V", 5.6658815444656859e-005, 1e-3),
 vel("DimethylEther", "T", 253.146, "Dmass", 734.28, "V", 0.20444e-3, 3e-3),
 vel("DimethylEther", "T", 373.132, "Dmass", 613.78, "V", 0.09991e-3, 3e-3),
 
-//// From Fenghour, JPCRD, 1995
-//vel("Ammonia", "T", 200, "Dmolar", 3.9, "V", 6.95e-6, 1e-3),
-//vel("Ammonia", "T", 200, "Dmolar", 42754.4, "V", 507.28e-6, 1e-3),
-//vel("Ammonia", "T", 398, "Dmolar", 7044.7, "V", 17.67e-6, 1e-3),
-//vel("Ammonia", "T", 398, "Dmolar", 21066.7, "V", 43.95e-6, 1e-3),
+// From Fenghour, JPCRD, 1995
+vel("Ammonia", "T", 200, "Dmolar", 3.9, "V", 6.95e-6, 1e-3),
+vel("Ammonia", "T", 200, "Dmolar", 42754.4, "V", 507.28e-6, 1e-3),
+vel("Ammonia", "T", 398, "Dmolar", 7044.7, "V", 17.67e-6, 1e-3),
+vel("Ammonia", "T", 398, "Dmolar", 21066.7, "V", 43.95e-6, 1e-3),
 
-//// From Lemmon and Jacobsen, JPCRD, 2004
+// From Lemmon and Jacobsen, JPCRD, 2004
 vel("Nitrogen", "T", 100, "Dmolar", 1e-14, "V", 6.90349e-6, 1e-3),
 vel("Nitrogen", "T", 300, "Dmolar", 1e-14, "V", 17.8771e-6, 1e-3),
 vel("Nitrogen", "T", 100, "Dmolar", 25000, "V", 79.7418e-6, 1e-3),