Fixed oversight with cloned Metric; updated unit tests.