[GEOT-4691]: Fixed tests