Merge "Change FinalizeTest to use helper function" am: fb76acff48
am: cf821d5f33

* commit 'cf821d5f33529bfc38fbcb103069a5b59cc6aa6b':
  Change FinalizeTest to use helper function