Differentiate between contact lookup key and metric name for SubscriptionMetric tests
Get rid of oneshot_with_value()