Added test for multiple collisions.
Also, fixed some typos and removed magic numbers.