modified the query and DataWarehouseInit to pass all tests