Added Trip and TripActivity tests