fixed test errors with 2.2.
fixed test errors with 2.4