Fix for the test associated to TROIA-373