Test for no-ff too
Merge branch 'test-no-ff'