Service provider tweak
Test refactor