Fixing selenium tests
(cherry picked from commit cf9d5f7)
(cherry picked from commit d34f673)