Updated order in which root/scope folders are returned from add_scope.

CI-171
Renamed test folders to remove 's' from default naming.

CI-171