Merge "Recovery test: Fix an parameter issue in string construction"