Merge "Update test case due to XML file changing"