Fixing unit test DataProvider
Fixing the dataProvider for another unit test
Merge remote-tracking branch 'origin/dev/fixUnitTest'
Merge branch 'master' into dev/SE-186