Make overlap strategy into a public switch
added timer
turn off all tests for benchmarking for now