Tidy up File_Proxy_Controller_Test setup/teardown.
Merge pull request #379 from shadlaws/fixes_20130601_3

Tidy up File_Proxy_Controller_Test setup/teardown.