Fixed unit test errors due to 29f16d1d

R=pmeenan@google.com, pmeenan
BUG=

Review URL: https://codereview.appspot.com/86500043