Fix holes in CTS test coverage

Change-Id: Icea31a9929cccb3fde3a1720e3950cf4b8d985b3
6 files changed