SONARJAVA-195 Improve tests