Added make_week method and tests.  Part of refactoring.