TEST tweaks and BF for rating scale component