VE-1393 Update the CNW tests to work with the new CNW flow