improve QA. tests coverage is now at 96%