added more location and trip tests