Updated week init and rewrote tests according to the updated logic