SONARDOTNT-344 Improve tests