Fix Selenium tests

Change-Id: Iba23bc2854c4f867ba0266e77246cf009c376406