FMS-338 : Fix and skip tests according to previous commit