Updated Cart Test

Cart Test now uses Cart model and improved collision detection and
moving.