Use random indexes in hit testing
Minor refactorings
Additional hit benchmarks