Merge "Use correct label casing in tests" into feature/zuulv3