Slight refactoring of metered testing charms, specifying their names correctly.

In addition to that, charm loading was modified, so a charm with an empty metrics.yaml file will have a nil Metrics component (rather than an empty one).
You were right - there is not good reason to treat an empty metric file differently.