Applying Daniel Martin's fixes for our test cases.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@728 d779f126-a31b-0410-b53b-1d3aecad763e
5 files changed