Updated shortcut; relfects new version of testthat and roxygen2