Better unit tests for #1744