Tests for D#2651 and D#2652