Update invoice item tests
Fix merge conflict in sales_engine