Merge "StatsEvent unit tests"