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

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