Merge "Fix Bubble test error problem"