organize tests
fix collision detection