Fix name of TokenServices implementation

Fixes gh-150
Fix format of toString() when sessionId is null