Move some more tests to integration cli Upstream-commit: f65fadbda080647ccb7e07dc64a8cc020170c4c7 Component: engine