Update tests for new upstream API and using invoicse