RPV-312 - Update tests and associated XML files for data importer to allow running with latest development code
changed throws to return null