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