Brought Catch tests back online for REFPROP backend with water; moved global headers to include folder; added umolar to both backends

Signed-off-by: Ian bell <ian.h.bell@gmail.com>