WIP: change the test metric class

Change-Id: I836fbc19b5599b0bbfb3578173b2e7d355803e45