FQA-1234:fix all bugs & test confirm ok