-bugfix to collision avoidance
-additional test code