Fix find_all and clean up returns
Resolve merge conflict
Correct failing test