Fix tests with old cmd function. Upstream-commit: e2a4b730ca6cc339122d013f33fedd593d95d1f3 Component: engine