#1507 highlighted that our testing coverage for search-related functionality is a bit lacking. This issue exists to track improvements to it to prevent such issues going forward.

• add tests for the SearchHelper helper;
• add integration / system tests for search;