Move more buildfile tests to integration-cli