Merge "Make finalization test more robust"