Refactored some test codes.