Cleanup metrics more.  Add CodaHale metrics tests.