Changes to make tests work with new style of tokens

Added handling of set command and tests for that