Move more buildfile tests to integration-cli Upstream-commit: c7fdd51eb6407fba41200e7a14f652519b179b71 Component: engine