Merge "Update test to use match external interface change"