Minor formatting
Added testcases for new @root command
First set of support for @root command
Cleanup
Refactored selector merging to support separate root loop for @root support
Minor fix