support WEEK as a selector of EXTRACT, and refactor test cases for EXTRA...

...CT