changes to analysis predicates and corresponding unittests