LQE-234 - Fix acceptance tests due to new controller structure