Fix test cases due to changes