Reordered Namespace and completed some tests