Added new tokens and tests for them.
Renamed PCV helper functions
Moved @type helper down to BillingEntity to share the love.