#5103: Fixed test templates + tests init commit