get rid of extra method
fix test flow
tune and rename xdcr config