Mock cleanups
Implement tests for Billing System