Clean up search_spec.rb and move new test

Follow-up to #406