Added converting function for mass
Added unit test and added to header