Revert "Test only discovery"

This reverts commit 59e902d70c0afb9c0bc7627a3593d83c2f936b79.