more cish tests

Test Plan:
<see below>
cfg

Test Plan:
<see below>