[TASK] Adjust and protect more generated tests