[misc] Updated tests after XCOMMONS-596

(cherry picked from commit 5b28f2d293aef0895b7adeff0b5640c51213829b)