merge old functor tests