Fix search tests on systems and sg's