convert tests to use subtests