fix(e2e): refactor tests.

LBSD-233 LBSD-217
is waiting needed here?