Fix bug in shift model.

Update tests.