Add collision detection test in controller