[GEOT-4574]: Updating tests