added Predicate tests & organized tests