LEDGE-226: adjusted tests
Merge branch 'dev' into feature/K4-K5