Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev