CLA-387 Added unit test for StatsD + review