As a start, moved 30 asserts to the new suite, still 378 is in the
original one.

Change-Id: I934bce63e286af3080ae014c3bd8f4f09866feb2