BAEL-6572: Added mapping for id and test, based on review comment#14712

theangrydev merged 5 commits intoeugenp:mastereugenp/tutorials:masterfrom

balasr21:masterCopy head branch name to clipboard