Added calculated fields functionality and test for salinity calculation