Merge "Add some basic tests for bubble controller"