Improved collision detection for SHAPES and changed our test to use it