Remove depends, use your own Provider, reforce tests