SOC-3000 | Fix test fails