Gh 1031

tested locally and updated billing tests.  Ready to merge.