SONARPLUGINS-3597 Improve tests