Refactor test suite. Update with source billing test