Cleaned up setUp() a bit.
Roundtrip works with branches