Removed search poisoner, made tests slightly cleaner.