(finally) fix some fragile test cases

Hello @nicks, 

Please review the following commits I made in branch 'xiao-fix-fragile-timing-test'.

404c18aad397ef274f7bcad32a9ddcdb16d577cc (2014-04-04 23:46:10 -0700)
(finally) fix some fragile test cases

R=@nicks