Added integration test for location upload and trip separation