Removed cloud-controller from require-dev, added cache dataProvider to some tests to complete code coverage
Merge branch 'test-fixes'