Final commit before release 2. Added more custom search tests.