moved around xH2 and H2OPR, fixed an import issue in tests