Updated test codes