Adding tests, refactored so the bundle calculate method returns a cart object