Billing updates

- cleanup
- fixed incoming tests
- report cleanup