Fixed small issues with WebUI tests

Change-Id: I13fab3f9de6409342a12c172417b60df2dca9c03