Bug fix on first/last week detection
Upgrade test configuration
Code cleaning