AMEC-2129 unit tests
Merge remote-tracking branch 'origin/dev-AMEC-2129' into release/2.9.2rc