Fixed broken tests
Merge branch 'mbst-8219-rovi-data-processing' into stage