Minor changes to tests to pass CRAN inspection