re-enable InvFcFmrc;
fix unit tests