Added test codes