LQE-245 - Refactor acceptance tests - fixed bugs