Split root into its own module
Resolve tests