Add location and tests. Also fix bug where tomorrow feature of model was not patched correctly.