Update metric API

Adding more tests to metric API