Modify some test codes according to key-manager's 2.4 API changes