Merge "Improve bubble test naming"