Update to the latests FCS and fix tests