Merge "Remove recoverBuilder use from test" into main