SONARJAVA-193 Improve tests