A few of the unit tests for sandboxing of review UI methods were broken on

release-2.5.x. The cause appears to be a difference in caching between the

file attachment's review_ui member and the file attachment comment's

review_ui member. I've cleaned this up to make sure we're spying on the right

thing. While I was in here, I also fixed up some bad naming.

Ran unit tests.