some more config related changes. All server Test cases are passing