Fixes on billing with metric
MailboxBillingTest tests passing
JobBillingTest tests passing