Fix BillingSystem tests