Tests for issues #224