Modified namespace and added tests