QA-5436 : fixed remaining defects