Minor provider fixes
Add spec tests