Repair other tests following the merge of the new backend.
Merge pull request #1523 from nouiz/fix_tests

Repair other tests following the merge of the new backend.