test alignments
refactor appName in appId
refactor rid in resourceId