SONARPLUGINS-2351 Add more tests and fix grammar