Add some missing validation calls
move esty_ci test helper to inner function