SearchTest minor clean-up