add Rcpp.test and actually added fixes from before