Added more tests and forecast for weeks