diff --git a/doc/transport_table/table.tex b/doc/transport_table/table.tex
index 906d9a01..501c592c 100644
--- a/doc/transport_table/table.tex
+++ b/doc/transport_table/table.tex
@@ -13,9 +13,9 @@
 \hline\hline
 Fluid & Reference & $\eta^0$ & $\eta^r$ \\
 \hline
-Nitrogen, argon, oxygen air & Lemmon and Jacobsen 2004 & $\eta^0 = \dfrac{0.0266958\sqrt{MT}}{\sigma^2\Omega(T^*)}$\newline$\Omega(T^*)=\exp\left(\sum_{i=0}^{4}b_i[\ln T^*]^i\right)$ & $\eta^r = \sum_{i=1}^NN_i\tau^{\tau_i}\delta^{d_i}\exp(-\gamma_i\delta^{l_i})$\\\hline
-Ammonia & Fenghour 1995 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\Game(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ &  $\eta^r = B_{BV}\rho\eta^0(T) + \Delta\eta$\newline$\Delta\eta = \sum_i b_i(T)\rho^i$\\\hline
-Carbon Dioxide & Vesovic 1990 & $\eta^0 = \dfrac{1.00697\sqrt{T}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \Delta\eta$\newline$\Delta\eta_g = \sum_ie_i\rho^i$ \newline$\Delta\eta = \frac{\Delta\eta_g}{1+\exp[-Z(T-T_s)]}+\frac{\Delta\eta_g}{\lbrace 1+\exp[Z(T-T_s)][1+\exp[Z(\rho-\rho_s)]\rbrace}+\frac{\eta_l-\eta^0}{\lbrace 1+\exp[Z(T-T_s)]\rbrace\lbrace 1+\exp[-Z(\rho-\rho_s)]\rbrace}$ \newline $B = 18.56+0.014T$ \newline $\frac{1}{\eta_l-\Delta\eta_c} = B(T)[\frac{1}{\rho}-V_0(T)] \newline $V_0(T) = 7.41e-4-3.3e-7T$ \\\hline
+Nitrogen, argon, oxygen air & (data) Lemmon and Jacobsen 2004 & $\eta^0 = \dfrac{0.0266958\sqrt{MT}}{\sigma^2\Omega(T^*)}$\newline$\Omega(T^*)=\exp\left(\sum_{i=0}^{4}b_i[\ln T^*]^i\right)$ & $\eta^r = \sum_{i=1}^NN_i\tau^{\tau_i}\delta^{d_i}\exp(-\gamma_i\delta^{l_i})$\\\hline
+Ammonia & (data) Fenghour 1995 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\Game(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ &  $\eta^r = B_{BV}\rho\eta^0(T) + \Delta\eta$\newline$\Delta\eta = \sum_i b_i(T)\rho^i$\\\hline
+Carbon Dioxide & (data) Vesovic 1990 & $\eta^0 = \dfrac{1.00697\sqrt{T}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \Delta\eta$\newline$\Delta\eta_g = \sum_ie_i\rho^i$ \newline$\Delta\eta = \frac{\Delta\eta_g}{1+\exp[-Z(T-T_s)]}+\frac{\Delta\eta_g}{\lbrace 1+\exp[Z(T-T_s)][1+\exp[Z(\rho-\rho_s)]\rbrace}+\frac{\eta_l-\eta^0}{\lbrace 1+\exp[Z(T-T_s)]\rbrace\lbrace 1+\exp[-Z(\rho-\rho_s)]\rbrace}$ \newline $B = 18.56+0.014T$ \newline $\frac{1}{\eta_l-\Delta\eta_c} = B(T)[\frac{1}{\rho}-V_0(T)] \newline $V_0(T) = 7.41e-4-3.3e-7T$ \\\hline
 Dimethyl Ether & Meng 2012 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & \eta^r = \Delta\eta$\newline$\Delta\eta = \sum_{i=0}^{1}n_i\tau^{t_i}\delta^{d_i} + \sum_{i=2}^{6}n_i\tau^{t_i}\delta^{d_i}\exp(-\delta^{p_i})$\\\hline
 Ethane & Friend 1991 & $\eta^0 = \dfrac{12.0085\sqrt{t}}{\Omega^{(2,2)*}(t)}$ \newline $\Omega^{(2,2)*}(t) = \left[\sum_i C_it^{(i-1)/3-1} \right]^{-1}& $\Delta\eta = 15.977\left[\displaystyle\sum_i g_i\delta^{r_i}\tau^{s_i}\right]\left[1+\displaystyle\sum_{i=10}^{11}g_i\delta^{r_i}\tau^{s_i}\right]^{-1}$\\\hline
 Ethanol & Kiselev 2005 & $\eta^0 = \sum_i a_i T^{n_i}& \eta^r = B_{RF}\rho\eta^0(T)+\Delta \eta$ \newline $\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+f_1\left(\frac{\delta}{\delta_0(\tau)-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=g_2+g_3\sqrt{\tau}$\\\hline
@@ -23,19 +23,19 @@ Helium & Arp 1998 & NASTY & NASTY \\\hline
 Hydrogen & Muzny 2013 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2S^*(T^*)}$\newline$S^*(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = B_{RF}\rho\eta^0(T) + \Delta\eta$\newline$\Delta\eta = c_1\rho_r^2\left[c_2T_r+c_3/T_r+\frac{c_4\rho_r^2}{c_5+T_r}+c_6\rho_r^6\right]$\\\hline
 SF6 & Quinones-Cisneros 2012 & $\eta^0 = \sum_i d_i T_r^{n_i}$ & FRICTION THEORY\\\hline
 H2S & Quinones-Cisneros 2012 & $\eta^0 = 8.7721\dfrac{\sqrt{T}}{S^*(T^*)}$ \newline $S^*(T^*) = \sum_i \frac{\alpha_i}{T^{*i}}$ & FRICTION THEORY\\\hline
-Propane & Vogel 1998 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta_h = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+f_1\left(\frac{\delta}{\delta_0(\tau)-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=g_1(1+g_2\tau^{1/2})$\\\hline
+Propane & (data) Vogel 1998 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta_h = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+f_1\left(\frac{\delta}{\delta_0(\tau)-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=g_1(1+g_2\tau^{1/2})$\\\hline
 n-Butane & Vogel 1999 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta_h = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+f_1\left(\frac{\delta}{\delta_0(\tau)-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=g_1(1+\displaystyle\sum_{l=2}g_l\tau^{(l-1)/2})$ \\\hline
 Isobutane & Vogel 2000 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta_h = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+f_1\left(\frac{\delta}{\delta_0(\tau)-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=g_1(1+\displaystyle\sum_{l=2}g_l\tau^{(l-1)/2})$  \\\hline
 R123 & Tanaka 1996 & $\eta^0 = \displaystyle\sum_{i}a_iT_i$ & $\eta^r = \eta^1\rho+\Delta\eta$ \newline $\eta^1 = b_0+b_1T$\newline$\Delta\eta = \frac{a_0}{\rho-\rho_0}+\frac{a_0}{\rho_0}+a_1\rho+a_2\rho^2+a_3\rho^3$\\\hline
 R134a & Huber 2003 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = c_1\delta+\left(\frac{c_2}{\tau^6}+\frac{c_3}{\tau^2}+\frac{c_4}{\sqrt{\tau}}+c_5\tau^2\right)\delta^2+c_6\delta^3+c_7\left(\frac{1}{\delta_0-\delta}-\frac{1}{\delta_0}\right)$ \newline $\delta_0(\tau)=\frac{c_{10}}{1+c_8\tau+c_9\tau^2}$\\\hline
-n-Dodecane & Huber 2004 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+c_1\left(\frac{\delta}{\delta_0-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=c_2 +c_3\sqrt{\tau}$\\\hline
-Octane, nonane, decane & Huber 2004 &  $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+c_1\left(\frac{\delta}{\delta_0-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=c_2 +c_3\sqrt{\tau}$\\\hline
-R125 & Huber 2006 & $\eta^0 = \dfrac{5}{16}\sqrt{\dfrac{MkT}{\pi N}}\dfrac{1}{\sigma^2\Omega^*(T^*)}$\newline $\Omega(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+c_1\left(\frac{\delta}{\delta_0-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=c_2 +c_3\sqrt{\tau}$\\\hline
+n-Dodecane & (data) Huber 2004 & $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+c_1\left(\frac{\delta}{\delta_0-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=c_2 +c_3\sqrt{\tau}$\\\hline
+Octane, nonane, decane & (data) Huber 2004 &  $\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2\mathfrak{S}(T^*)}$\newline$\mathfrak{S}(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+c_1\left(\frac{\delta}{\delta_0-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=c_2 +c_3\sqrt{\tau}$\\\hline
+R125 & (data) Huber 2006 & $\eta^0 = \dfrac{5}{16}\sqrt{\dfrac{MkT}{\pi N}}\dfrac{1}{\sigma^2\Omega^*(T^*)}$\newline $\Omega(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = \displaystyle\sum_{i=2}^n\displaystyle\sum_{j=0}^me_{ij}\frac{\delta^i}{\tau_j}+c_1\left(\frac{\delta}{\delta_0-\delta}-\frac{\delta}{\delta_0(\tau)}\right)$ \newline $\delta_0(\tau)=c_2 +c_3\sqrt{\tau}$\\\hline
 Water & Huber 2009 & & \\\hline
 R152A & Krauss 1996 & $\eta^0 = \dfrac{5}{16}\sqrt{\dfrac{MkT}{1000\pi N}}\dfrac{10^{24}}{\sigma^2\Omega^*(T^*)}=\dfrac{0.2169614\sqrt{T}}{\sigma^2\Omega(T^*)}$\newline $\Omega(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$ & $\dfrac{\Delta\eta}{H_c} = \displaystyle\sum_{i=1}^{4}E_i\left(\frac{\rho}{\rho_c}\right)^i + \frac{E_5}{\rho/\rho_c-E_6}+\frac{E_5}{E_6}$\\\hline
 R23 & Shan 2000 & $\eta^0 = \frac{5}{16}\sqrt{\frac{MkT}{1000\pi N}}\frac{10^{24}}{\sigma^2\Omega^*(T^*)}$\newline $\Omega(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$  & \\\hline
 R404A, R410A, R507, R407 & Geller 2000 & $\eta^0 = \sum_i A_iT^i$&$\eta^r = \sum_j b_j\rho^j$ \\\hline
-n-Hexane & Michailidou 2013 &$\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2S(T^*)}$\newline$S(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$& $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = (\rho_r^{2/3}T_r^{1/2})\left\lbrace\dfrac{c_0}{T_r}+\dfrac{c_1}{c_2+T_r+c_3\rho_r^2}+\dfrac{c_4(1+\rho_r)}{c_5 + c_6T_r+c_7\rho_r+\rho_r^2+c_8\rho_rT_r} \right\rbrace$ \\\hline
+n-Hexane & (data) Michailidou 2013 &$\eta^0 = \dfrac{0.021357\sqrt{MT}}{\sigma^2S(T^*)}$\newline$S(T^*)=\exp\left(\sum_{i=0}^{4}a_i[\ln T^*]^i\right)$& $\eta^r = \eta^0(T)\rho B_{RF} + \Delta\eta$\newline$\Delta\eta = (\rho_r^{2/3}T_r^{1/2})\left\lbrace\dfrac{c_0}{T_r}+\dfrac{c_1}{c_2+T_r+c_3\rho_r^2}+\dfrac{c_4(1+\rho_r)}{c_5 + c_6T_r+c_7\rho_r+\rho_r^2+c_8\rho_rT_r} \right\rbrace$ \\\hline
 \hline\hline
 \end{tabular}
 
diff --git a/src/Tests/CoolProp-Tests.cpp b/src/Tests/CoolProp-Tests.cpp
index 53dee807..f8594bb2 100644
--- a/src/Tests/CoolProp-Tests.cpp
+++ b/src/Tests/CoolProp-Tests.cpp
@@ -34,12 +34,12 @@ vel("Propane", "T", 600, "Dmolar", 10.03e3, "V", 73.92e-6, 5e-3),
 vel("Propane", "T", 280, "Dmolar", 11.78e3, "V", 117.4e-6,1e-3),
 
 // From Michailidou, JPCRD, 2013
-vel("n-Hexane", "T", 250, "Dmass", 1e-14, "V", 5.2584e-6, 1e-3),
-vel("n-Hexane", "T", 400, "Dmass", 1e-14, "V", 8.4149e-6, 1e-3),
-vel("n-Hexane", "T", 550, "Dmass", 1e-14, "V", 11.442e-6, 1e-3),
-vel("n-Hexane", "T", 250, "Dmass", 700, "V", 528.2e-6, 1e-3),
-vel("n-Hexane", "T", 400, "Dmass", 600, "V", 177.62e-6, 1e-3),
-vel("n-Hexane", "T", 550, "Dmass", 500, "V", 95.002e-6, 1e-3),
+vel("Hexane", "T", 250, "Dmass", 1e-14, "V", 5.2584e-6, 1e-3),
+vel("Hexane", "T", 400, "Dmass", 1e-14, "V", 8.4149e-6, 1e-3),
+vel("Hexane", "T", 550, "Dmass", 1e-14, "V", 11.442e-6, 1e-3),
+vel("Hexane", "T", 250, "Dmass", 700, "V", 528.2e-6, 1e-3),
+vel("Hexane", "T", 400, "Dmass", 600, "V", 177.62e-6, 1e-3),
+vel("Hexane", "T", 550, "Dmass", 500, "V", 95.002e-6, 1e-3),
 
 // From Vesovic, JPCRD, 1990
 vel("CO2", "T", 220, "Dmass", 2.440, "V", 11.06e-6, 1e-3),
@@ -69,7 +69,6 @@ vel("Oxygen", "T", 100, "Dmolar", 35000, "V", 172.136e-6, 1e-3),
 vel("Oxygen", "T", 200, "Dmolar", 10000, "V", 22.4445e-6, 1e-3),
 vel("Oxygen", "T", 300, "Dmolar", 5000, "V", 23.7577e-6, 1e-3),
 vel("Oxygen", "T", 150.69, "Dmolar", 13600, "V", 24.7898e-6, 1e-3),
-
 vel("Air", "T", 100, "Dmolar", 1e-14, "V", 7.09559e-6, 1e-3),
 vel("Air", "T", 300, "Dmolar", 1e-14, "V", 18.5230e-6, 1e-3),
 vel("Air", "T", 100, "Dmolar", 28000, "V", 107.923e-6, 1e-3),
@@ -77,6 +76,25 @@ vel("Air", "T", 200, "Dmolar", 10000, "V", 21.1392e-6, 1e-3),
 vel("Air", "T", 300, "Dmolar", 5000, "V", 21.3241e-6, 1e-3),
 vel("Air", "T", 132.64, "Dmolar", 10400, "V", 17.7623e-6, 1e-3),
 
+// From Fenhour, 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),
+
+// Huber, Energy & Fuels, 2004
+vel("n-Dodecane", "T", 300, "Dmolar", 4411.5, "V", 1484.8e-6, 1e-3),
+vel("n-Dodecane", "T", 500, "Dmolar", 3444.7, "V", 183.76e-6, 1e-3),
+
+// Huber, I&ECR, 2006
+vel("R125", "T", 300, "Dmolar", 10596.9998, "V", 177.37e-6, 1e-3),
+vel("R125", "T", 400, "Dmolar", 30.631, "V", 17.070e-6, 1e-3),
+
+// Huber, FPE, 2004
+vel("n-Octane", "T", 300, "Dmolar", 6177.2, "V", 553.60e-6, 1e-3),
+vel("n-Nonane", "T", 300, "Dmolar", 5619.1, "V", 709.53e-6, 1e-3),
+vel("n-Decane", "T", 300, "Dmolar", 5150.4, "V", 926.44e-6, 1e-3),
+
 };
 
 class ViscosityValidationFixture