Exclude tests from Sonar analysis and adapt code to DiffMerge versionchangeChange-Id: I5c343ed0dca30c78d425c1d4d8110fee4cbbed5eSigned-off-by: Tu Ton <minhtutonthat@gmail.com>