Daniel Bottomly fixes to tests to pass cran checks, deal with bioc incompatibility