patch for fixing tests of fm classes