added testing for trip and location. pending optimize