Cleanup Rescorer Tests & add random indexing