moved tests as per Hadley's email, to comply with update to testthat