Update trunk tests to use create_trunk method.

Change-Id: I5eed63cf454596c1b58f1ec9546669c03f234341
5 files changed