Changed namespaces
Updated Namespaces in the tests