Use "Wait until .." and use id attributes when clicking some buttons in the robot tests.

This seems to make these more reliable, as they otherwise occasionally fail.