Adapted to testthat 0.8 recommend directory structure