Tweaked the collision test mechanism