Issue #1: Various fixes and minor edits.
Issue #1: Added several unit tests for retrieving content.