Fixing column name.
Fixing logic for current week test.
Introducing flag on whether raw should be loaded.