simplify test and drop functor dependency