Issue #3227269 by Andras_Szilagyi, vintimpe, selvira, claudiu.cristea: Fix tests failures & add coverage for new features
Closes #3441257
8.x-2.x
4.x
changed target branch from 8.x-2.x to 4.x