cleaned up contenttype predicate and adding testLib