Search without replacing test time

Vanilla: 6-7s
Full: 16-17s