fix tests that broke after metrics upgrade