- fixed merge no-ff test