Update tests to follow up changes on the UI and replace repeated parts by macros.

There ins't a major change of behavious here