should I convert the whole test-file to 1.9 syntax? The diff contains more or less the whole file anyway.