Fixing test cases based on the recent changes