Updated tests to work with namespace.