Update Provider tests
Fix options handler. Update interface.
Reformat code.
Fix CS