Back-migrate new test cases

Change-Id: I5d9801087d187e8f130699f0fad2898e9201c19b
7 files changed