Changed lastWeek logic back to correct form, removed logic used for

testing. Resolves issue #739.