Adjust tests to new searching
Move import to correct module