Engine: fix tests that failed after rebase with devel branch