Collisions now account for velocity, improved test coverage.