Added test project, additional predicates