sendilkumarn fix issues with test and remove cyclic dependency