moving some tests around and adding new tests
added consumer tests
moved predicates
more predicate tests
moved supplier tests
moved everything
clean up from refactoring
merging tests