InvoiceServiceTest nad some other fix