Weather package changed.
Tests.
Refactored.