AMEC-1779 updated unit test
Merge remote-tracking branch 'origin/dev-AMEC-1779' into release/2.9.1rc