fix for #2. update tests to support tokens and added token property to user class