fixing test cases based on the new Config changes