Add tests for #543
7 files changed