Improving reproducibility probability estimation and preserving RP-testing