Add an & in edit test to test for appropriate encoding

Requires Ie698724729f2757e31ec7c05dce60bfd9f33f8db

Change-Id: I9801d47731ae1310c7c18e1da86841e1dbb14513