Adding test from #2619