Fixed (kind of) the tests. Updated metric semantics.

Change-Id: I77730a956cac23d687bde15097c53ed66b614c45