Finished test for file retrieval. Did some cleaning up.