Move provider getters to external
Totally fixed specs