More updates to the testcases after the has config changes.