Added support for direct harvesting of static providers. Plus some refactoring and more tests.