minor changes for tests and R CMD check