Fix wrong CSS class
Improve E2E tests; add new tests