Added tests for month. Refactored accordingly.