move to new testthat structure