GDS-1097 Updated tests