Service provider tweaks
Test refactor