Modify tests as per the changes made