Converted tests for item_retrieval. Two tests still fail however.
Clean up some indentation
Updates to item retrieval API tests, and an API fix.