Merge "Add tests to cover trunks"