Adding base service providers
Fixing strict test issues