Trip/TripInstance + tests