Add unit test in attempt to reproduce #960