SONARPLUGINS-3462 SImplify check and add test