Refactor tests for clarity; Add strfweather() test