[JENKINS 16620] Added test
[JENKINS 16620] Fixing issue