Fixes remaining tests
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0