- Add support for alternate content sources.
fix unit test.