Fix follow and timer tests
Merge pull request #468 from starwed/test-fixes

Fix follow and timer tests