Changes in FDModel and tests