Fix smoke test

Agent renamed the metrics the smoke test was using. Change to use
the new metric names

Change-Id: I1271d738d169c57df8ddba4165a65deb1982fbff