More stats instrumentation & tests