simplify collisiontype tests
move detectCollision into its own spec