Tests for feature #686