Add some tests for issue #1934