Fixing timer tests to cause less false *negatives* (typo on master commit)  (cherry picked from commit 4ba10066d90702ab43515b30c919e88d307efba5)