Simplified tests.  Easier to make simple tests
Added Billing Code test