Decouple unit tests from structure of the token.
Include corresponding conditions in the token to support issue #48