Fixed some test errors.
Fixed some test errors.

okdave/gjstest,google/gjstest,okdave/gjstest,okdave/gjstest,aungzanbaw/gjstest,okdave/gjstest,google/gjstest,google/gjstest,aungzanbaw/gjstest,aungzanbaw/gjstest,google/gjstest,aungzanbaw/gjstest