Fixing test and problem with tokens generator
Merge branch 'master' of github.com:Gregwar/RST