Donington-U.S. Team getting along?

I hear that before going across the pond, Stewart and Ferry were at odds with one another. I hope they've buried the hatchet for this event. Can anyone shed light on this? I thought it was weird that they wouldn't practice with each other as teammates and wouldn't test at the same time at the Kawi test track.