Add support for weeks and months
tests for weeks and months