Debug search
Removed debug
Updated tests