Metric fixing

a bit of metrics + first pass of couch service tests
So much cruft removed.