Improve test (to be squashed).