Resurrect message search result tests from d5f289d1bbd.