Fix tests
Rename metrics to analytics