add test data for providers
fixed merge conflict
got emailing providers working
fixed merge conflicts