updated predicate tests
added specs for functor
updated specs for functor