Changed test codes