Fix the script that collects data from moves

Fix the script that collects data from moves to also populate trip data. This
was a regression introduced by my refactoring this summer. Also added unit test
cases to confirm that the trip is populated correctlys so that this won't recur
in the future.