Made syntax used in tests more concise - resolves #32

(Also removed repeated javadoc from overloaded versions of evaluate and
getPredicate.)