Update tests for R CMD check