Merge changes from topic "unittest"

* changes:
  SF TimeStats: add unittests for TimeStats
  SF TimeStats: Remove some redundant functions
  SF TimeStats: Make TimeStats class non-singleton