Fix test cases for the previous commit