InvoiceTest fixed to match changes