Fix test cases for 2e82849b