added dynamic tokens and rspec