Fixed test user values that were expected key presses, not resulting values
Updated calc_weeks to allow base date to be passed in