Completing test for bug report #2830
Tests for bugs #2834 and #2994.