Activity metrics, client and body metrics + tests