Change the namespace and add a test