Fix&Test based on second certification evaluation