Fixed DI issues with ServiceProvider
Added Test namespace