<pulkit> remove some redundancy and support center controller tests continues