Fixing merge conflicts, adding tests.
Added test
Added tests, changed Weeknumber name to WeekOfYear. Fixed merge conflicts.