Prefer testthat subdir for package tests
Add default argument so old expectations continue to work