Update folders to work with testthat 0.8