Merge "Construct file path based on current user ID in test" into main