Update to match new typeKey semantics
Add a test for the sessionToken property
Drop current-user stuff, fix session key