adjusted some parsers, and started writing some Predicate tests