AMEC-2361
* Updated several of the calls to content repo and made error handling more cohesive.
* Removed unit tests to the content repo since they are really integration tests. They are still in code, but are commented out for when we figure out how we want to mock the content repo.