More work on pathtree based path handling
Tests adapted to new OT generation