updated some ast predicates and unit tests