Merge "Avoid mocking in BubbleEducationControllerTest" into main