test cleanup: use subtests