Fix CI/CD errors after merges for quality and integration tests