fixed some erroneous tests
Merge pull request #957 from tjwebb/billing-testfix

fixed some erroneous tests