Fixing broken tests; fixing code from the latest codereview.
MoinMoin: GoogleSoc2012/BranchMergeSync/2012-08-14 (last edited 2012-08-15 13:53:14 by BorisBobrov)