Some finder test fixes