tidy up, drop search_helper & test-kitchen in.