Add random samples (A/A test)

Test Plan:
WIP
Minor fixes

Test Plan:
WIP
Add option for disjoint sampling

Test Plan:
WIP