Made providers configurable
Added default options
Updated tests for configurable providers