Revert previous change that modified sonar.tests.

Change-Id: I83fac40f75e392e20d76caad1141be80aaaceabd
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>