Refactored weather test.