new test, with --no-ff this time

jj:x