Fix EDI tests am: bc81d8ca9e am: efb363ead6 am: d86d53a8b2 am: ba62154107 am: 6df182f484
am: 5f7487964c

* commit '5f7487964ccb54ceed78af0c4198454e25a5b132':
  Fix EDI tests