Change namespaces of tests. Add some indents.