split up two subtests, cmp_ok in more places