Update the smoke test for the new metric names

Change-Id: Ia6231d49d8f50422494ccf35db9567f9da92f745