fix test and some stuff FMS-254