DEVP-2665: fixed tests
DEVP-2665: fixed step
DEVP-2665: wip test
DEVP-2665: fixed tests
Merge pull request #661 from WarnerMusicGroup/DEVP-2665

Devp 2665