SONARVS-24 Improve tests