LQE-245 - Refactor acceptance tests (LQE-4, LQE-5)