Modify some comments and test code for supporting backward compatibilities.