Changed Namespace, added tests