Update and rename weather test code to weather code