fixed tests
Merge remote-tracking branch 'origin/CDB-339' into release/2.1.5