[CB] -- re-added team dropdown, added tests