Added predicates tests

Added unit tests to predicates as well as reorganizing the code and
adding an if? combinator. Removed cond?-x form due to inconsistency with
rest of module.