Adds a working collision_search test
Adds collision resolution to the collision search test