Fixing unittest for CORS
Fixing code after changing to DataTokens
Fix for new web_spider.only_forward implementation