Changed unit test
WS not working on Heroku
Revert
Enabled CORS