qa tests fix
qa uts added