Revert "Removed test namespaces"

This reverts commit 134623c70cbf3e9b5df6e77a80c5db4941de9a99.