Fix/384 broken selenium tests

https://trello.com/c/MLFfLb3f/384-fix-broken-selenium-tests