Added tests originally developed in NWR
v.0.2.3
finish merge