Correct models and add test for overlapping shifts