LQE-162 - Acceptance test for LQE-5 + fixes in other stories