Fix the finder and adapt spec to new behavior