reworked test / added deserializers for tokens