adjust Functor test to account for new definition of Functor
Merge branch 'master' into spireonspark