modify tests basing on reviews feedback