Merge "Add more logging to finalization test"