Fixes a unit test
Merge branch '7.0.0' of github.com:umbraco/Umbraco-CMS into 7.0.0