[FIX] Adapt tests to new changes from makefly/master repository
commit 25315fde21641cf3c599e4abbe7a3d9d0ca2e887