ETag fixes and more TripPin tests.