Fixes in Timer unit-test