Trips test refactor