More extensive unit tests for #1956