#1051 / #603 - reset the UnifiedIndex in the discovery test before rebuilding, since it now resists a rebuild