fixes some test logic
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0