Fixing unit tests for tick-based timer compatibility.
Authored by: m0slevin 2016-02-08
Parent: [r321]
Child: [r323]
