Test/billing sessions

also contains a commit from the user account shortcut pull request. Maybe merge that one first.