[IT][QA] Aplied suggestions by @Sara_t