Add unittest
Add viscosity critical enhancement
Fix bug with calculation near critic point