[misc] Updated tests after XCOMMONS-596