Tests for #614

Tests for #614