Added namespace, service provider, tests