Fix failing test
Remove unused imports
Make search avoid narrow pathways instead of refusing to go there at all