follow-up: fix e2e tests and reintroduce test-ids

[akafazov]

#1927 was a temporary fix for the tests to unblock the main branch.

Steps:

• add test-ids again in the frontend, so they can be used for the tests to reliably identify UI elements
• refactor tests by removing hacks from the code (PR above)