Merge "Specify the resource identification in unit tests" into main