Fix the `week` behavour to match api2
Give the WeekColumnClause funcs unique names.

This makes it much easier to test them individually.
Add test coverage for the week-related code.
Merge branch 'fix_test_coverage' into filter-by-week2