QA: Tests for story 1628

Note these are expected to fail.

Change-Id: I4ceb6c81f2be72a08622cca8d4db813cc98aa49c
Merge "QA: Tests for story 1628"