Finished implementing the tests and functionality for the current data providers.  About to refactor stuff out.