US1945 Added tests for service provider.