cleaning up test directory structure/namespaces