Remove support for setting defaultRoot
Fix tests
Merge branch 'remove-default-root-support'