Merge "Change FinalizeTest to use helper function"