Added Namespace

Added namespace and updated tests