Changed specs and added specs for #30 functionality.
Changes to make the new provider strategies work, fixed issue #30.
Merge branch 'feature/issue_30' into develop