More tests for bug#1979