Added tests originally developed in NWR